From: Raspbian forward pporter <root@raspbian.org>
Date: Tue, 2 Jan 2018 07:09:46 +0000 (+0000)
Subject: Merge version 0.12.0-13+rpi1 and 0.12.0-14 to produce 0.12.0-14+rpi1
X-Git-Tag: archive/raspbian/0.12.0-14+rpi1^0
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ea256d556a39a2fcb4746c3a5fb91199b13884b8;p=libfm-qt.git

Merge version 0.12.0-13+rpi1 and 0.12.0-14 to produce 0.12.0-14+rpi1
---

ea256d556a39a2fcb4746c3a5fb91199b13884b8
diff --cc debian/changelog
index f810bbb,99efd74..b8b6f2e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,11 +1,18 @@@
- libfm-qt (0.12.0-13+rpi1) buster-staging; urgency=medium
++libfm-qt (0.12.0-14+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 0.12.0-13+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 13 Dec 2017 01:52:52 +0000]
 +  * Add symbols file hack for Raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 13 Dec 2017 01:52:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 02 Jan 2018 07:09:46 +0000
++
+ libfm-qt (0.12.0-14) unstable; urgency=medium
+ 
+   * Bumped Standards to 4.1.2, no changes needed
+   * Removed branch from VCS fields
+   * Removed debian/gbp.conf
+   * Removed trailing whitespaces  
+ 
+  -- Alf Gaida <agaida@siduction.org>  Wed, 13 Dec 2017 20:08:02 +0100
  
  libfm-qt (0.12.0-13) unstable; urgency=medium